bitkeeper revision 1.1709.1.9 (42b056day4oavPqdg1qWc4E5Lgw8Bw)
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Wed, 15 Jun 2005 16:27:06 +0000 (16:27 +0000)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Wed, 15 Jun 2005 16:27:06 +0000 (16:27 +0000)
Merge djm@sportsman.fc.hp.com:/home/djm/xeno-unstable-ia64.bk
into kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk

1  2 
xen/arch/ia64/vcpu.c

Simple merge